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

Change-Id: I3ca84b5e113bdbd73b103656c0716d3417a4dbf4