am 2f413d82: Reconcile with jb-release

* commit '2f413d82e2541002b7f9507ad66d341d130f80e1':