Merge "Remove more dead code." am: 0c2dab9adf am: 498163c28a
am: 44464dd129

Change-Id: If165bbb4bcc53f3c7f58c15cd137ab62e8ebacc1