Cherry-pick an upstream fix for Calendar class

TBR=elwarence@chromium.org
Bug: 792537
Change-Id: Idfc4fa258d0f9ffb6fd236183275ec4580a00f73
Reviewed-on: https://chromium-review.googlesource.com/809729
Reviewed-by: Jungshik Shin <jshin@chromium.org>
3 files changed