Merge "Snap for 4398898 from 16d3bc63f12e27349f234a5d3907d72377c87f4d to marshmallow-cts-release" into marshmallow-cts-release