Merge "Remove field prefixes." am: 281998c825
am: 56687edf0a

Change-Id: Ib9e3ea34dbf3bfeb90ce58bb898eeaa5a54cbde3