Correct the code path of implementation for the abstract method

Change-Id: Ib32c096b490f98259b5d1421df97549e506e501f
Merge "Correct the code path of implementation for the abstract method"