S69664 Add the Analytics Chart Builder Shim
Merge remote-tracking branch 'origin/master' into f5684_swim_lanes