am eaf1b227: Reconcile with jb-release

* commit 'eaf1b2279ad634054673047cf5d04de211b1a011':