Merge "Add missing transitive dependencies"
am: ff615e320f

Change-Id: I2ee95031f0ae8d8c274daf60bde09fb2edc480ae