Merge "Make ApiModuleManagerTest::testAddModules un-risky"