Merge "Remove field prefixes."
am: 281998c825

Change-Id: I979c95c85ace599bf97c02757815ea7bfa4668f3