Merge "Add tejaswiy, opg as OWNERS for aconfig overrides" into main