Snap for 5645017 from ab55ff5da0ed61ddf59d6c4df406ba9e335d75f7 to qt-aml-release

Change-Id: I99ede36e1eecbb9a3a1777d35b52cd41d015c7d9