Snap for 8232685 from ba297c19c2a7017fe744ec2dc248349d966f0f6e to sc-qpr3-release

Change-Id: Ie10a02589e7278fa9a0d6ff675e7e6381ef24ff4