Snap for 5567502 from 97091609ce0bb32ec297554e62e29587237b2276 to qt-aml-release

Change-Id: Ia12e624f6d47d5e13412ca41d4188f01171daa5c