Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev
am: 0540b9fc0b

Change-Id: I874bfe8e7f05e4f0fa107108607fd864afdeec5d