TLS cleanpu

Change-Id: Ibba20fef78735698d5974d587c87a54288da09f2