Fix broken tests
The signature of mw.Map was changed in I7ff0b230.
Bug: T146432 Change-Id: I2ba409a4b4efd36f632c76f54da2207783373079