Merge "Switch Bundle's implementation over to ArrayMap."