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

Change-Id: Ic4b009594a435b151df7a6def265cbaa169c2a0c