Snap for 5582669 from e32282b48e259fe33a8d3bb0304e0dac6bc51fce to qt-aml-release

Change-Id: Ifb7a214784f3066a86a5cc26308702a6e7582f7c