Minor code-review cleanups to previous CL

Related: de7d21c10a6e829dae1b3a00618b871313d5a433
Bug: 2454870
1 file changed