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

* commit 'bf50d26612d0f6db72406264cbbf9c19ae215be9':
  Fix Optional Features Being Required