Merge "Add missing transitive dependencies"
am: 9a92a189f6

Change-Id: I36f03053988adbd3fec2e977af98e1740b80a782