Snap for 5715241 from f92db984416ec02a2b5cdf2c40b4cdf0ffe6203a to qt-aml-release

Change-Id: Iba792f2de0c5fc76be50199d6370838a6b7d44e4