Snap for 5863759 from ff99804575cd5ca87126a161d93dcc1b09e8eb81 to qt-qpr1-release

Change-Id: Ib9f26f11994c35a8bbc3cf8c8b8e31170b2e9b36