Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I272934cd72bc940d2baa77c97a96c06bae4f4a0f