Merge "Cleaned up dead code" am: d14ed44c52
am: bcea94219a

Change-Id: Ic3701fac667f51f1ab8faef451355fff4ac97249