Snap for 5698755 from cac9a2b10bf269437490c40a5717fb2fb8cdb08c to qt-qpr1-release

Change-Id: Ibf513d2d4a45f33afa8216a587bff3848c687944