Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I4a18c51a81818830e242211ee464aef0e961b0b4