Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I17a677ffe0fc8690c059072478ca3ad7f0deec16