Snap for 5626839 from 857a861c182c86c0f1d61e813ba63b8b95e9bc12 to qt-qpr1-release

Change-Id: I61ff14d2120cc9c3cce9a6c9fbbc284999b0e9b6