Snap for 6313343 from 360a06de6878ed38fa2ebf973843140e3b3920ab to qt-qpr3-release

Change-Id: I29803dae9e248bb3a0dc9d2651477d451670ecde