Merge "Remove unused class"
am: 09f6675744

Change-Id: Ieb0a2b557a19dac51801513c66fac102c3b17b2d