Merge "Add missing transitive dependencies"
am: ec520cf757

Change-Id: I159abbb707bb1f29a2763b9652f57a94308f9617