Merge "Annotate some data classes with @Keep." into main