Fix: 208654839 Test: manual (enroll and verify animation) Change-Id: I1d21d3533c65f75158a9602875294fdfa6a36701