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

Change-Id: Ib64a2bdc60b75a89c3b3ca5d144482fdb2f8971a