am 53a30410: Reconcile with jb-release

* commit '53a304102f3c0509feaf22bb9c717e5216a45150':