Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I44075b7cfbe6421bf9febc1515a0b40021af34a9