Snap for 5235151 from a8d17218d6b2c3f2c18e2cc327ccbc7d732f66c0 to qt-release

Change-Id: I57fd7647c62304e5feb3953ee44aea6214ebc505