[automerger skipped] Merge "Trim away some dead code" am: d6a1657466  -s ours am: d85b36fde3  -s ours
am: c7826490b4  -s ours

Change-Id: I6b97b70476bea4e16dac912a59a1bdd105848138