WIP updates for tls ref impl

Change-Id: I995008fc8df8f3672dad95620f400e38bd01cbe7