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

Change-Id: Ifb0f9c06ad25a526d8780ce37d0aa2db7934eba7