Only convert the interfaces now, convert the implementations later.

Change-Id: I8a84f239d59a5fe21c62615d9ff8e2defa07badc