am 45533a34: Reconcile with jb-release

* commit '45533a345d5218f131fb5fae95efa4a1e524a0d2':