Use canonical class name.

Change-Id: I7dc9980d334bc5ad6421135d713d890a8588281c
Merge "Use canonical class name."