Snap for 5558719 from b9b6a727d692abb5fb0a13229e3a529b2b724889 to qt-aml-release

Change-Id: I5971861a9fda0c985e44af4761b2ae797bf2ccbb