Snap for 4767896 from fcea6af00f824f20d901f2ac6650ce1763df736f to qt-release

Change-Id: I214e63fe6249f06c1680c62e636d1cecd82c6796