Snap for 5956190 from f9128dcf0251f491b8d58ad6ca947c362d2d9d49 to qt-qpr2-release

Change-Id: Ia3693a6c01b511374116c4605288c6e36939db53