Snap for 5688406 from 92d2d7ea97070e70bcf7c5db7c6645606438af8b to qt-aml-release

Change-Id: I1652bfd82b3ad93aeef91c2635e59b9306e65a6c