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

Change-Id: I69d020067d2cb82e000368bea8839057e1c18899