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

Change-Id: I4d950f39735b7c3fa5e3f7d943736dd39e824f41