Snap for 5715241 from b57c006c9fc4285a0a217ce443049fd4d610f6f4 to qt-aml-release

Change-Id: I83a3769ef1a50d14584ff0ee293579308307d933