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

Change-Id: I031a7da9ca00db4b1b99a177df4cc5bc97b6ca7d