Merge "Merge changes If44268b0,Ie808507f into qt-dev am: c553357837 am: d067627d96" into qt-r1-dev-plus-aosp
am: 7d61521a89

Change-Id: Ia1602634a1477cf22ef8b15999f588711c5b7dd5