Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ib963dfdc7d352e6d674750031e117b3e6d05dcbd