Merge changes I05aeb909,Iee31eed6,I2544a7cb into qt-dev am: 315f7aabe8
am: d3a1e43bff

Change-Id: I15728ae429b72e1dfed1260d049dc365ff584e8f