Snap for 5582669 from 821836d715f2a34c181ea2de0bd40c0ca3ce8806 to qt-aml-release

Change-Id: I98dc370db0cf7151e2a557f9d758b692859dd601