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

Change-Id: Ib328db263876028131009f8b02033da5c99e6327