Snap for 5333170 from d3aaf77c58a5886c113f88a99c6aa8f2b7873107 to qt-release

Change-Id: I17c9d8bb197bb6b1126a83f8d4c7efb697d016df