Merge changes from topic "b_132890298" into qt-dev
am: f581d1b92f

Change-Id: Ib9f9a4e12ba930abc75d15db25c64f8a85aa6c44