Snap for 6131310 from a24d10f534384c6b65dc7345736d0f3eec6581dc to qt-aml-media-release

Change-Id: I5e04d01eed7f039cf10e0901e1f48af3f552177b