Snap for 5511141 from 3fd86902d3a144e518695be6cde44a2a2770b559 to qt-aml-release

Change-Id: I06e112be7d4cca2f8a18f84e6db85efbb7e900e0