Merge "[ToA] Add annotation for getter" into main