Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Id94f334e6a92cf48ac774f1f4233df95d9241274