Snap for 8364388 from 67046c5998372546c36d5bbc4a2847d65862b039 to main-cg-testing-release Change-Id: I0b564752f9c8dfd26f5a6edb861bb5d97aafffcd