Merge "Delete dead code." am: cf59ff79c5
am: d305a7c894

Change-Id: Icdb4d429fcdf4060feab8a25cf67b3a230a35eb7