Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I804144e79bf82b1d6d1f9e6dc9073249aad597f0