Snap for 5691688 from 09980abea745ade1cee73d49a8e533643df62042 to qt-aml-release

Change-Id: I331edb74611f6d8b62cc510a6bac620429b363d8