Merge "Check add/remove flavor access APIs attributes"