Reconcile with jb-release nakasi-factoryrom-release

Change-Id: If4904e84859a14006a3669574a6ab1e7a87949e7