am 0bd67e27: Reconcile with jb-release nakasi-factoryrom-release

* commit '0bd67e27da917c029cd991d9cd8ab1d4b8cad64b':