Merge "Snap for 4485046 from 62ab4ac6b208d7e659961b9f58f3706e0978bb44 to marshmallow-cts-release" into marshmallow-cts-release