Merge "Test for flavor-access-list with private/public flavor"