Merge "Add missing transitive dependencies" am: 0fd09b6f80
am: fe3ff6bab8

Change-Id: I0c1d5bfd80ed2c8f27b68a092eaa90886eeeadbc