Merge "Snap for 4398898 from 4c77786b1b7d80aaaaef9263e45a8403c9608585 to marshmallow-cts-release" into marshmallow-cts-release