Merge "Fix global finding logic."
am: d88210b676

Change-Id: I7ed869cbd0089c63dbb51fa7b2b2b2ebfb673a92