Merge changes from topic "bp-135269143-q" into qt-dev am: 660c3b11c7 am: 58f725221c
am: d796dbe3f9

Change-Id: I6675f190a46a789d3a0d5b84db5f3890fffdb4c3