Snap for 5606001 from 351330189384806d311dec53927ff25a392ac1cb to qt-qpr1-release

Change-Id: I8bc9ccd65dc1a72b22cf21c8c1a0501ca5bf0ef4