am 850d1013: Reconcile with jb-release nakasi-factoryrom-release

* commit '850d1013e96d074051950c9ffc4cbdebaafdf4f9':