Merge "Remove unnecessary class name"
am: f628417ce9

Change-Id: I2e66be6251b2427543e7c8a1cf2daf0c01b23e89