am e2ad335c: Reconcile with jb-release

* commit 'e2ad335cc2bac806aa22544c1b3b109b0bbec746':