am 92650eaf: Reconcile with jb-release nakasi-factoryrom-release

* commit '92650eaf253c14f113c8655bd69f9ff5fed9f5ce':