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

* commit 'e78d87df3253516a93c1042beabe0edfe782a170':