am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev

* commit 'af0d09be288214e01a4cc661a8173bb11c453061':