tlv: !!! Update to reflect TLV code updates !!!

Change-Id: If20ffdc33f137c28db58c3a6d9af09ec86ad39d8