Merge "Snap for 4841033 from 47e2366324a299e0a9b6d59d4df6d20bc328996b to marshmallow-cts-release" into marshmallow-cts-release