Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I5a5b95da6c33afbc36893e162f3b57c09c161ee2