Merge "Delete more deprecated code."
am: 350aa270f3

Change-Id: I644e3771ba3391944683106eb66dfc4ac9bb342f