Merge changes Ib9a15fec,I9f3f2588 into qt-dev
am: f4a435aca0

Change-Id: I183872610bdf46e7d6fb38b374c4de0985e05aad