Snap for 5558719 from 3c74cff2e5ab69b2a48632c65aa4747f52597611 to qt-aml-release

Change-Id: I7ea64ec31fb1ca5551d9f0827beaa4fe807356ef