Snap for 6508895 from f60d844103c9ff9c2de868f23bed993812a17d99 to mainline-release

Change-Id: I43e3ddd5d1f812e091370cbd9323889d3b3abde5