Snap for 8559592 from 4e31cff4d47da6f7e49cd6640b2a516ea42ce32b to main-cg-testing-release Change-Id: Icd043c7934f45da10d2e14abc4649c415823eccb