S69664 Add the Analytics Chart Builder Shim