Snap for 5900353 from af1e831ab794aa10df7bd6f595e3e4d16571df1f to qt-qpr1-release

Change-Id: I1523e26ad6ba3809d3a5dfd72ed75707c00a3519