am d6204cf0: Reconcile with jb-release

* commit 'd6204cf0bc6fddb04031510cca3cb44b2b4a6d4e':