Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I2bc2763dc285edb9aa8bd9bedd068ee4483a3ce5