refs AE-1682

Change-Id: Ibe8c74bf15cec0309594d34f3988746751524e2f
Reviewed-on: https://gerrit.instructure.com/c/switchman/+/369862
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>