Snap for 5948990 from 7cd153dadc6a05924e6ba043a4340308bd621898 to qt-qpr1-aml-release

Change-Id: I0a1ca42c08b77cee0dea508b386b0efa2186ecd5