Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I8efb3018010f96a9a7dbcf004172c6069ea62f95