Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ia25e07058f5b7ac1f60650ab8835ad7fa0243dca