Fix bom dependencies.

Change-Id: I645b2bc6a8b8e228cfab1bafd1f261292c664f36
Merge "Fix bom dependencies."