Snap for 8294919 from f9ba267a39fe31bed324b249a51c33f6d86c3055 to main-cg-testing-release

Change-Id: I84fc3dc2bba642522a323babb512b53972a3e6be