am e35ae86e: Reconcile with jb-release

* commit 'e35ae86e70b1e728c220867d5a2aa66955c87c34':