Merge changes I8bdb4c74,I613a7d03 into qt-dev am: a09ee2d39f
am: 655d6f5cde

Change-Id: I5c2d40505470b85a0e01df4ba864a1f47191accc