return after finding the reference

Change-Id: Ia22b97b0a45d8d840095737638c2ccf68373e27a
that method is the same as in the base class

Change-Id: I8cb6f59795d9461c0e02ab70d7edd60af1410c1f
remove copy&paste code

Change-Id: I5710856fdb9fb91573de89eeb5a29d3d106ad7a6