Snap for 5645017 from 5ac1671ba678b91262c0864da21ad91953ae86ed to qt-aml-release

Change-Id: I877e6615a135e7ca1f92e05e4f69670a475fa2e6