DO NOT MERGE: Fix searching for overridden methods. am: 008ddd928d  -s ours am: f7602ac731
am: b89f75efad

Change-Id: Ie405532b69f8c11c1c16d5d56ad0ff96d7369f03