refs AE-1682

Change-Id: I0fbf86ffb2ff3d729d5ebf91cce3f93046fe99ae
Reviewed-on: https://gerrit.instructure.com/c/switchman/+/369676
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>