am dce5d51d: Reconcile with jb-release

* commit 'dce5d51d370d2aabfbba7cca2f1078984954b112':