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

Change-Id: I35170185229a0e00f8b8f22f9560e49d844972c6