Merge "Fix which maps to search for globals." am: 7cffd15110
am: 00a95a939e

Change-Id: I9be6a7edf96fae2bc48a19ae55e6d8b0f6440ced