Snap for 7637474 from 3d8135e8db690141bd16b90b6df717ebb27072c5 to sc-qpr1-release

Change-Id: Ie493d6d1b2c7315d3ae7802c4a0ac042ebda1be2