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

Change-Id: If545d4ff7de51d48624f8748efafb798dbd64355