Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I1a745465e7631d3953d7be731bb164b317437dd6