Snap for 6337011 from b2e9acf4eb6b04402c6ced50fcd9806566c7f7d1 to qt-qpr3-release

Change-Id: I0032d84c970b398f0a9bf739eaa608762556319a