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

Change-Id: I28e43eb4eb5f3775374bb6afdd0667f03783d28f