Merge "Delete unused classes" am: 5f7d355677 am: fcb22aab79 am: a5a032ab05

Change-Id: I293d63c643b39401bc333b013d19fbee41c9b12a