Snap for 5512101 from 70d0e0f3b335dec2081bcf8648b1c0538d79a7a5 to qt-aml-release

Change-Id: I6748f53e7665cb7e17842f89585375166dd6a6d2