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

Merge commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51'

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