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

Change-Id: I760d74bdd125911bec6c7f1a4cfecca41e3de1c9