Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I2b5e77195eae1a9676c2530a9023290936e55255