Merge "Add missing transitive dependencies"
am: 0fd09b6f80

Change-Id: I2aabd24fb6bb0611347c4928db1cda097c930d38