Snap for 5656554 from 4e5fddd5f5628420e9f6b65a6d2a692e4ea03cd3 to qt-aml-release

Change-Id: If18b58d6cdc671b24bf332a7eb9a99e728d751cb