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

Change-Id: Ia25a28cce1361eca9aa8a8ddf6c8af5c25b7eb0b