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

Change-Id: Id2a87e51d92e24530448297a2fe4cd34d611fcac