Snap for 5212161 from 31ed7f33f8dc7d68b92d3ebac8ea1a3f7352dd38 to qt-release

Change-Id: I5eda2de84163ebabc7ee8383635fcdc780428958