Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev
am: dbcca24f8e

* commit 'dbcca24f8e239a34ededaef8a7fc924c196f98cb':
  Fix issue #28964589: Binding dies when (unrelated) component is disabled in package

Change-Id: I020e1ccbd04ada3c1ff7826042bc476b8a755584