Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I00d1e51120d9a41e8d5e33646f9f86e852e0631e