Merge "DO NOT MERGE Add test for security bug 32873375" into marshmallow-cts-dev