am 30dce3d9: Reconcile with jb-release nakasi-factoryrom-release

* commit '30dce3d9b05a210943be9429f5615e0e277dd657':