Snap for 6055731 from 506fd42a89494c836eda69df354177affa0820f8 to qt-qpr2-release

Change-Id: Ib2b29116e660e856772b3562e667a223fd06fd38