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

Change-Id: I9cd5933da6620f8877b813f60a4f768291c2a3ba