Snap for 5698743 from ba3529d605ae04d9c17dc7b9eccf618ff1667621 to qt-aml-release

Change-Id: I752f812c9c5d994969032577f4b952e802d304c1