Merge "Fix issue #28964589: Binding dies when (unrelated) component is...
Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev am: dbcca24f
am: 2198f8f5
* commit '2198f8f5':
Change-Id: I5fc0d059ac2958e4238e7f50deedbdfd3057037d