am 7eca687c: Fix bug where we would return null with disabled components.

Merge commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9' into eclair-plus-aosp

* commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9':
  Fix bug where we would return null with disabled components.