automerge: 6fbe299f * commit '6fbe299f': update analytics event tracking calls to use new script bug: 16331906