Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ifb66dc982a827827f324018084f0c6f191cb3769