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

Change-Id: I236776727876a92795089234b2df770651df43a9