Snap for 6131310 from 3434812945d5cf30d56e94fff0158c4b27c8e229 to qt-aml-media-release

Change-Id: Id710bc5b3b90068f15de11f519149c4f0acf15b0