Merge "Fix ModuleInfoProviderTest by passing correct flag" into qt-dev am: 5d612f02b8

Change-Id: Ide396764d369792eb55000119d4383598e76964d