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

Change-Id: Iae7e2985b830614b4d0a18e3798b2b084faf2f7c