Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I51d86c45479eb7be5e06325d344a6d1c21fd5247