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

Change-Id: Ia10fbe53ff5aceae9cd6fe65a23935969dc5d804