Merge "Cleaned up dead code" am: 4f65edeaac
am: 23fcf519f2

Change-Id: I362188a509e19be24f2e376437d05429410f34f2