Merge "b/1522903 First step in converting allday events to local timezone"