Include type in field names.

Bug: 149014222

Change-Id: Ib18a1976b7263a63f659b13f24f59dabdafeda4a
1 file changed