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

Change-Id: I90858270a431a528f991168778fd466ed20f3df7