am e167e1cf: Reconcile with jb-release

* commit 'e167e1cf7f23f3605523c6c6808a1a39eecc74ef':