Snap for 5645017 from 7f20188e8738c2bdc66780c7420a574e65ae106d to qt-aml-release

Change-Id: I397692c1bd4ad42cafb86e227c495ecef218f019