am a9d5c825: Reconcile with jb-mr2-release - do not merge

* commit 'a9d5c8259176af09e0d27d8941a5832069f862fc':