am c09cea39: am 6abea1eb: Remove fields no longer in API.

Merge commit 'c09cea3931bfd61eb0fee7eb09f51ede27212722'

* commit 'c09cea3931bfd61eb0fee7eb09f51ede27212722':
  Remove fields no longer in API.