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

Change-Id: I29c0bac262ab4f5ed81e843160fd7f4fae03ce18