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

Change-Id: Ieec8f9ae7c542487a108c06f66b4292046e4ff4c