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

Change-Id: I2929725d8b9b9176bd15b23e975bdee0867bb1ff