am 57150b3c: Reconcile with jb-release

* commit '57150b3c30a066bdf7f346223bf0707a345c4e47':