Merge "Fixed dependency management."