Snap for 5645017 from e2faf9c0d8db8c6af1dbafd95447d1c8e8cef085 to qt-aml-release

Change-Id: Ifc977c4e0558e6bf692d9d0fb4cbfbcb44117470