Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Iba78ea27bcf56a64b7cbe9eae6d81291e6dd81e9