Snap for 5803298 from c30c60602bcd3bd7a12d75ac1206fdeb92b096de to qt-aml-release

Change-Id: Ib4ef5d967a4aad0a17c36fbfa311a11903ef9ecd