Merge "Clean up some uses of "auto"."
am: 99a77162e9

Change-Id: I522e3084575b1359843b93e41cd90d1c3f1de8d9