Snap for 5709920 from df0177f979a4f5ca82f302bc00aab03f417432b8 to qt-aml-release

Change-Id: I70cb62ab0779be674b91ca9422bafd0ec2eb671e