Merge "Address comments I missed on a previous CL"
am: e4cdd4dbcb

Change-Id: I088e2c8dbfc750f35c11b90f35ec2bb7cff7e478