DO NOT MERGE: Fix searching for overridden methods. am: 008ddd92 -s ours am: f7602ac7 am: b89f75ef am: bfc1d77e -s ours Change-Id: Ia2eb3ee58f5f53a33785383c869b405a9f00fbcd