Merge "[SDC] Chart cleanup for AAF/TLS removal"