Further simplification of collectValues.

Bug: 274159734
Test: N/A
Change-Id: Ida3fef1ae465f492241660af1d1518a1d0233496
1 file changed