Snap for 5803298 from fab218e3b8fbeb4c00ad60d07becec1353a27428 to qt-aml-release

Change-Id: I4c6459e78a80177ee5f36c9394648121fdff0ac9