Merge "Add missing transitive dependencies" am: ec520cf757 am: 40f13876cd
am: afdde6b428

Change-Id: I9aa56ab2133c1228e29ef9c084e0b46f040d0539