Snap for 5715241 from 56e9dd901e4aee80be23929938a1eb80edb05f8a to qt-aml-release

Change-Id: I3d96482c59f0ea51551746d93cdc2035a5f2f692