Remove invoke-as [2/2]

Change-Id: I1899a0cfe83db84bb7425188f49c0cbd91cad8c1