Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I7f5c04fa20effddd5d84fd0cd9d01f28c20bfd32