Snap for 5511022 from 650e2eb73ad4335f64b7d25e83bfb628f13e1cb3 to qt-release

Change-Id: Iad36fee9d73c9372133bc48930f80324c959eb7a