Merge "Remove unused class" am: 09f6675744
am: 04ecb95ea9

Change-Id: I2f9c971db885bf7309438f2f44b18de4df62a709