Snap for 5511141 from 421cc2e5f70e617e342b4f911233697dfac40eba to qt-aml-release

Change-Id: I34b973dd8898b28dd6688a988d2bb120e3f18939