Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Id4489ede7670faf70f532424a2ed3729a8aadfe1