Merge "[A1P] Chart Cleanup from TLS/AAF"