Change-Id: Ic716f336b7071063997cf5b4dae6d50e0b4631e9
-The macros take care of prepending the leading underscore when necessary.