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

Change-Id: Ib89b0914e7b78488810347712813703196347fbe