Merge "Fix ExerciseSessionFormatterTest and HealthDataEntryFormatterTest" into udc-dev