Merge "Add missing transitive dependencies" am: ec520cf757
am: 40f13876cd

Change-Id: I200740e8a425fbe83b87680b0abab5a4425545a4