Merge "Use ArrayMap instead of HashMap for IMMS#mClients"