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

Change-Id: I00eff41800e46bf0af7350cf30d0222e78f12b0d