Merge "Add missing transitive dependencies" am: ff615e320f
am: 5f72eb1464

Change-Id: Id735fba8af2e16ee1e851684e963100830785230