am 21a012ef: Reconcile with jb-release nakasi-factoryrom-release

* commit '21a012ef1a1f06acda65fc6e3efaa72ffe1d2b07':