Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I11059ce915026c9a63c37f41fb68ba459eeb4872