Snap for 5674428 from 5e1c51498bfc235cda38e48f6de3ca8a84feae4a to qt-qpr1-release

Change-Id: Idd26a9391fcd8875e945a8b261adba6f8e51f2e3