Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I247268c7e5086e0d117c0ae133731f0353cd492e