am ffcd2e48: am d90835a4: Merge "Remove RequiredFeatures Annotation" into gingerbread

* commit 'ffcd2e4895b5429e7cee2ef372fc1474d8656678':
  Remove RequiredFeatures Annotation