am 1a4f71b2: Reconcile with jb-release

* commit '1a4f71b2d49a2dc761188fa5b3bc3c07ad9220cc':