Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I1894c61b87d17afb56f564b36fda3b87a6b3f5a4