Merge "Skip flavor_access_add/remove related tests"