Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I51f6059054379d1cc1cc4bc6080f3bb48cf77a48