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

Change-Id: I3eae8148ce1304c763bdd85a2a42258a463cbb61