Update class name

Change-Id: I1a5eb15de7f94fb46b9f9b5f8ae336f8e58f6950
Merge "Update class name"