Merge "Add missing transitive dependencies" am: 0fd09b6f80 am: fe3ff6bab8 am: 410254f885
am: 9a3e07e013

Change-Id: I54ca852b8c560e2715d0b0c14931244ff51e5db1