Snap for 5511141 from 8d3d65de4c0fbf54405cfc2b4ddd52dc7e1591ac to qt-aml-release

Change-Id: Ia9284eaf9f6bc9b2cd7fbc7cc0038b3d03e9d83f