Merge changes If44268b0,Ie808507f into qt-dev am: c553357837
am: f17baa09f4

Change-Id: Ibd9a4859b1d35d5715823bdb708990c8d12f118d