Snap for 5591699 from b6abc280aac5d793997180af7285b8a8902a4834 to qt-aml-release

Change-Id: I74ba5c5d9df18a437683572ce0fbde7b8282243e