am dd52a9dc: Reconcile with jb-release

* commit 'dd52a9dcada2c89a723c49b213c4679424ecc728':