am d4c19447: Reconcile with jb-release nakasi-factoryrom-release

* commit 'd4c1944784ee70f45b83560dbfe1760a4db2b5b8':