Snap for 5567502 from e4a6d249d018bf4fa86df49bd15ecd4145862d56 to qt-aml-release

Change-Id: I5c33cc80c93af64046d6796ca95b2a68b8f056b1