Merge "Fixed calendar fields comparison"
am: 9aeb6edf55

* commit '9aeb6edf5518a839156de7aab808a75a8fd6843b':
  Fixed calendar fields comparison