Merge changes I08c5006a,I6686b77c into qt-dev am: d42cb76a74 am: aa0a1a769c
am: 2d95956a16

Change-Id: I4bbc9ecd7ae26c3e44ee812b3c4f98dd62c10cb7