Since these will be used in the future, add a comment saying this, as well as switch to using executor level constants instead of local strings for these events. Change-Id: I0bd6e1ca09da0dbae0d0c2787ceb9ce1a41cb7de