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

* commit '888498ec8f3c01e39bf0b202fbd926725d9d54a1':
  Prevent invalid frame durations