Revert "Silence auto-value warning" am: 534a24a454
am: 862427da9b

Change-Id: If389a205d930446d3b1911fee97242426e4ce203