am 227d45ea: Reconcile with jb-release nakasi-factoryrom-release

* commit '227d45ea2b9ccade09fd620d028e992ff1140b99':