[automerger skipped] Merge "Fix ModuleInfoProviderTest by passing correct flag" into qt-dev am: 5d612f02b8 am: 6d35c7c7c2 -s ours
am skip reason: Change-Id Icf93ca7dcf4fc2d7625fe7f9175c59200ae600b6 with SHA-1 b243197d96 is in history

Change-Id: I45e27192be2642ad022c8ff54b78b5512eb6714d