[automerger skipped] Merge "Trim away some dead code" am: d6a16574 -s ours am: d85b36fd -s ours am: c7826490 -s ours Change-Id: I6b97b70476bea4e16dac912a59a1bdd105848138