Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I0d6a14cf398ec8b8bed5022a40d030aeca8b8006