Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I701bd3cd419681dfb8836d19a323bfb47c53a298