Snap for 5235151 from 401838404e1d8a86d539a97733296804fa55dae5 to qt-release

Change-Id: I30d8aca4958a369f4fcdfe4243db2b67f60e8910