Snap for 8580505 from fd6e7cbcf0e007fa6deb01e67d67c78511478cfa to main-cg-testing-release

Change-Id: If424bb6f2970dd477d588fb28a8eb9e927762750