am c44a3ae2: am f0cea9f8: Merge "Prevent invalid frame durations"

* commit 'c44a3ae2704af52c0f4ea006b5b02a53b6df6c46':
  Prevent invalid frame durations