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

Change-Id: I4a1142c12b7bc5b9879efe7169beecd4194d1571