am d06a73bc: Reconcile with jb-release

* commit 'd06a73bcb330e1a560373158be9009daef10a046':