Snap for 5681502 from c745f09b33804242c43f823242f0112645ed3a98 to qt-qpr1-release

Change-Id: I273775fa3eb8585d140cfcbfd517aad621a92d68