Merge "Fix global finding logic." am: d88210b676 am: 15c7e20207 am: e5436f0979

Change-Id: Ia80eb01cd8c02c0f36385e1228ac03121695210e