Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I4ae6aa33840d968c43fad23c3f5ee9f0d8a695d4