[automerger skipped] Merge "Fix ModuleInfoProviderTest by passing correct flag" am: 8670b8b2bc am: 59c9cf770b am: f466c1eeb5 -s ours
am skip reason: Change-Id Icf93ca7dcf4fc2d7625fe7f9175c59200ae600b6 with SHA-1 be7417db93 is in history

Change-Id: I7ef58c9111f2652e45b429f658e7cc4f59666953