Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I988b644a8fc479af57a19dc947fbb1075e5bc515