Merge change 25635 into eclair

* changes:
  Add new thumbnail API.