am 2bb1f870: am 1edd8277: Merge "Hide unused fields" into eclair

Merge commit '2bb1f87089faa14954c1b5afa92a34ea947f5ff6'

* commit '2bb1f87089faa14954c1b5afa92a34ea947f5ff6':
  Hide unused fields