Merge \"Add a few trace points for animation loading.\" into nyc-mr1-dev
am: 8e3b57aad5

Change-Id: I05cd897ef70f7eef70fd3f361ec7564b6e837302