Snap for 5558719 from ae9e769d90104bb1a680601e15c9befdd26e21cf to qt-aml-release

Change-Id: Ie683c8edd07a95f6b5134b5316cc68164a885dab