Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I3bc06420f32fe0ce50b6943fe33eca293f375d05