Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I565a757a5f9b37f075d53a446c915506ceef0074