Use updated CurrentInstance API (#9945)

Change-Id: I6576c4be4d6c909ce95e8b48904529477ae755f9