Merge "Fix the incorrect usage of test_exclude_features" into marshmallow-cts-dev am: 3df64a3478 am: 840f656f06 am: 2622da700e am: 65049d43f1 am: 5005e78140 am: 8b44acc015 am: 6cd52df5ea am: 407dbe9496 am: f01818276d
am: a3e633f0f4

Change-Id: I08860972946d40218c4529d2fd460c4a982d63b0