Merge "Update reserved permission controller flags name" into rvc-dev