Merge "Snap for 5735642 from a367e0e4fa7f1eacbf7dbad93f6b3c00cf469587 to sdk-release" into sdk-release