Snap for 5671249 from 0b4311702f735476c098bc398a4ca444fa00a4a4 to qt-qpr1-release

Change-Id: Id770a7cc8c21e6ef7b6780fc159dd2c627f8e3fb