Snap for 4989835 from 4bc5564dbf4142dca7038962c6d37c8e01e72ff6 to qt-release

Change-Id: I7e3fca3121bbb3654f682072469ad7cd8269863f