Snap for 5691688 from cb06c2b3769dc316f54b69ae316bbe2ec205bfce to qt-aml-release

Change-Id: Ifeaead7861ea5a2c84fffc3b2156ed45eba5a84c