Merge "Add DefGrantPoligyTest to TEST_MAPPINGS"