Merge changes I39880b58,I51a4f5ee into qt-dev am: aba879935f

Change-Id: Ia83bc958967685b6f34fbd19176b58455bc4775f