Snap for 8153161 from de5be3dbc2fcbf55915bf882849e429cf6505bd0 to sc-qpr3-release

Change-Id: I7a9271615cc3524a3a86ad52437d89ddfc38941a