am c4514c09: merge from open-source master

Merge commit 'c4514c09124b203bf120889bc42d2bc9532d40ad'

* commit 'c4514c09124b203bf120889bc42d2bc9532d40ad':
  donut snapshot
  donut snapshot