Remove _ from builtins

This helps ensure that the _ from i18n is used.

Change-Id: Ibffca00435203d4ef3538fa3d9cd020f77c31c36
Merge "Remove _ from builtins"