Snap for 5691688 from 03c02527526fc98a862470ca2344111e1d4b7a56 to qt-aml-release

Change-Id: I28fb0f897d10be7864b557cab148862893ef6e83