Snap for 8417597 from d4e7e2336adf8d10cdd9ab321be7933af6f05c1c to sc-qpr3-release

Change-Id: I68d53bab704de257ebec2041841fe478bcd0b26c