Don't use '_'

'_' has different meanings in different
projects, so avoid its usage. Some use
it for gettext functionality, some don't
so lets just stick with not using it at
all.

Change-Id: Id241bd2e17e01ff724848961520b82eea7cfdecc
Merge "Don't use '_'"