Snap for 5626917 from a795429468f6216631f184fbc83fa68f708e9095 to qt-aml-release

Change-Id: I5eee8a772a19bf65fcd9fc176cd61beebf1d1c61