Merge "b/2358627 and b/2293263 Fixed eventDay bugs."