Merge change 7948 into donut

* changes:
  Fix updates from read-only calendar.