Snap for 5547420 from b67d133b83c830b5341aaaaae0cb0cb1a45bb415 to qt-aml-release

Change-Id: I6ee472906ffecbac0bb62321629532b69d03dec3