am 86d8ff31: Reconcile with jb-release nakasi-factoryrom-release

* commit '86d8ff31edbaef1a0cc40991b7452026c7ff350b':