am 40d87ee4: Removing @Override to fix the build

Merge commit '40d87ee4867baa25fd7a824f324ea7040bf5bc23'

* commit '40d87ee4867baa25fd7a824f324ea7040bf5bc23':
  Removing @Override to fix the build