Merge changes I88f247a2,I7e1daf93 into qt-dev am: 3aac07ff6b am: b4ad5740a3
am: 38abc2bff0

Change-Id: Iad80e93d6e493c2d5057558f071f7946e7bd2e13