Snap for 5730547 from 0d9c4080f49e70c4e20f10ef235f29384aff991b to qt-qpr1-release

Change-Id: Ic5d9484bec5122e5bdc13b067e9c7dc8c227bdc0