Snap for 5596078 from e55724765970cd22e74b8cfed61307c01c350e8d to qt-aml-release

Change-Id: Ia0bbbf7b39986efc5a1349679d526523d4f74c49