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

Change-Id: Ia2eb3ee58f5f53a33785383c869b405a9f00fbcd