Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I4b380bdeae49d0298d84affa6a8778a5f30fe3df