For the same reason as aosp/1549479, the old method needs to call the new one. It's not enough that they have the same implementation ; when NF calls the old one, it needs to indeed call the overridden new version. Test: TH Change-Id: I5e8700fc7455317da382f2328e3f548b3392ca41