Snap for 5636702 from adb2e7a485
to qt-c2f2-release
Change-Id: Ic0ddd5f52eeaf23eb38be0542cbdbd4ebe6a2930main
commit
4117510f5a
adb2e7a485
to qt-c2f2-release
Change-Id: Ic0ddd5f52eeaf23eb38be0542cbdbd4ebe6a2930main