am 04eca90f: Reconcile with jb-release

* commit '04eca90fd31a83c3838694804c8bab6e76450977':