Snap for 7829835 from 5e2dff3a9dcdb01b8f874c5882d5cb7714470c2b to sc-qpr1-d-release

Change-Id: I7017861b76b0ffbcc4fca014d00467d730612b73