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

* commit '878f5bfe3a960cb5d4e79a452fb1bc13b5375862':
  Fix Optional Features Being Required