am d90835a4: Merge "Remove RequiredFeatures Annotation" into gingerbread

* commit 'd90835a42c8a487c3f992c009c975e8bc99a3c2c':
  Remove RequiredFeatures Annotation