Snap for 5691688 from 1b0469450bc220be807e95edf7ffde68682ce194 to qt-aml-release

Change-Id: I56c05c0b5b4d6d586ce8f89cc6d7efdd4d45913b