Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I3b1537c86c60cde239ddc283531ee4735aa97046