Snap for 5907400 from 036ea7795e4a1f8ea67d473d5c44d382a8565e5f to qt-qpr1-release

Change-Id: Ie80ba940f5febe6a22320a6246421e9f85eb484f