Merge "Fix ModuleInfoProviderTest by passing correct flag"
am: 8670b8b2bc

Change-Id: I0138df80133f9e1cfd2106706dd3c1846d991a8c