Snap for 5860054 from 2d709131bac0fc4bfd12efe0f316c635c0ca700d to qt-qpr1-release

Change-Id: Ia99f1552eded6677164e513d08b2e737e1e2abbc