Snap for 5691688 from ed032f3403b2c7be0b009da7fc1b22101860cdca to qt-aml-release

Change-Id: I30d1ba254767ef9acaa6d3ae571bb19bfc1953d2