Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ic5f9f074942c800ffb75e0c36212a8143a5b06f6