Merge change 21386 into eclair

* changes:
  RIO-6135: thumbnail retrieval for H.263 is broken http://b/issue?id=2049580