am e76b096c: Reconcile with jb-release

* commit 'e76b096cb7d6f94f1a1979fe8cb7ca1c10e3b4cf':