Address minor comments after go/ag/858723

Change-Id: I549bd3290ae47d46b2ef10553466db2c29296ee9
1 file changed