Snap for 5511141 from cf7da11bd1314504cc465b94779ca14e7de075d7 to qt-aml-release

Change-Id: Ia84e0a64b7cc80240755e1e9d1e3f35ff656abcb