Snap for 5558719 from c66df1844e2d26fed2920e1776f5b5975b26e610 to qt-aml-release

Change-Id: I05ac6318b44e1964c99f8cc08761cad2dd8591b4