Merge "Fixed calendar fields comparison" am: 9aeb6edf55
am: cd51388e01

* commit 'cd51388e01fdecd516218c7a9597618b10781843':
  Fixed calendar fields comparison