Merge "Suppress testAndroidTestCaseSetupProperly"