am 21273a6a: am bf50d266: Merge "Fix Optional Features Being Required" into gingerbread

* commit '21273a6a9ca8a43cd90521f6d6bb4dc6015b842a':
  Fix Optional Features Being Required