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

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

Change-Id: Iddb62c3079bef31acac4d1698242711a27c5dbb6