Snap for 5803298 from 207fc987584e2008123f00d53718c25935ee2825 to qt-aml-release

Change-Id: Ib3812b27facb89739ea13e8ba486a469f4fb1686