Merge "Remove unnecessary class name" am: f628417ce9
am: 15dc64993b

Change-Id: I3cc1a00c279d13dad3f3d23ffc298c37dbe0beee