fix some derps from animation commits being merged out of order

Change-Id: I6e775237df75fa84ba1e215a12d1b8185ec32c90