Merge "media: adjust time offset in case of time lapse" into nyc-dev
am: 7f7052f

* commit '7f7052f5e45f8eb1df80a6978e0095d9e9c9eded':
  media: adjust time offset in case of time lapse