Merge "Fix modules.dep breakage with multiple module dependencies" am: 73461abd0c
am: 9c0198e6e9

Change-Id: I4e1ecf13d31bec16a4fe44358c1dd8def0203916