Merge "Remove flavor dependency from InspectorBasicTest"