Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I3884b8c6eb23857a8662eca0ae0bb34baa0e378c