Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I144ad5d4e0916cc84eae3bc1101b7620738e9c7e