Merge "Remove dead code." am: 3bde05d928
am: 8e5fb5a0e7

Change-Id: Icc3a59fc53d57ad4f60529e36b577bb8e38c7d49