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

Change-Id: I19a82cfb8850c15f749f3313ded4f7fa944715be