Merge "Remove RequiredFeatures Annotation" into gingerbread