am 1501e50a: Reconcile with jb-release nakasi-factoryrom-release

* commit '1501e50a1680bb24aca39b5021dd3e81bc30c9c2':