Snap for 5631779 from b9e776abada1a08ffbbec47dd7fa16e86a4dd00e to qt-aml-release

Change-Id: I63dc35eb22d106de794d7379f5bf3292fdc907a2