Merge "Add missing transitive dependencies" am: 9a92a189f6
am: e1ee607b28

Change-Id: Ib39f2b1ce5649b15c31a8ea89dec85e543678772