Snap for 5626917 from 9f8adb6e7d6e7938b9313046437ba30b1ddfb6b5 to qt-aml-release

Change-Id: Ib41d1d7798f5766f44978caca30f42b23b9390d5