Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I66ce5e9ca22d4aecb694bf8814fbf3404fb0013b