Merge "Merge changes I256e6ed1,I97d41ed0,I6b4177e4 into qt-dev am: 111a49ba97 am: ce30c8ee3b" into qt-r1-dev-plus-aosp
am: 9ac8c55976

Change-Id: Id66eaf94ed5bc3ebc0d1ff6ab377dc498985903b