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