Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I066f2ea934faee09776a9c798d414bc6d66a57af