These are handled in the wrapper now

Change-Id: I7ccd3f6c724d6fe5f4ff85af66d69bb631e88721