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

Change-Id: I87ff3edc419185a07e07bd9fbf3d74d18cdd9284