Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Iaa4109b5db2d6b15e214c05554b586e5604d9692