Merge changes I8bdb4c74,I613a7d03 into qt-dev am: a09ee2d39f am: 036d594c69
am: 4a99f4ca90

Change-Id: If1ca5d391b6cfa6262561110bd39ce2287d694d3