am 21ee1566: Reconcile with jb-release

* commit '21ee15662f1a40b63071aa634d504de1bcb85bd2':