Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ia729bda8ec410e28f5389f8e73aaae1ea9c5365b