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

Change-Id: Ifbf25a0b678d2dfb02ba3d0e1021fb1222a5ff9b