Cleaning up list of common nicknames

Bug: 2447291
Change-Id: Id162b6a65e15ccd903accb4258d596944cf80ad0
1 file changed