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

Change-Id: Ibcbc22b6f4f77825f16e52a832e28fcb40d3fa6d