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

Change-Id: I5b9006099a564fe8de1811e1254a3859ef3449d4