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

* commit '8b77646ff7ac846efc59492a5d57360e2733f3a2':
  Remove RequiredFeatures Annotation