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

Change-Id: I165d1028ff1ae022fae7a2032c5fb476d80e4ca6