Snap for 5316819 from d88b30ca5ada93ba3d736df854c3f6440397dbe6 to qt-release

Change-Id: I48b8a0b6a2b23c3d99aaef1e1baba78ff2d5777c