Merge "Fix support finding global variables." am: 2da8e3c2ee am: e7b9b114d0

Change-Id: Ifcb262411c6b9107c35787716bf5dad2771bfa01