Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
am: 0839185647

Change-Id: I5cc4c3393403bf8c299b415be81bc9b80fb93ca9