am 293d5dac: Reconcile with jb-release

* commit '293d5dacb13a21dc4eb185ed16588c76a77cfb16':