Snap for 6091187 from d1211dd26bc00052f2447d91b16c591034f1a9fa to qt-qpr2-release

Change-Id: If23d28fc9157724c2536460c74abf2cb740d35dd