Snap for 5713042 from 8ba0b82605dc311ef2af59f9116f80212429d965 to qt-qpr1-release

Change-Id: I8f99b217af6785a97974599d56b8ae1f5aeaa07c