Merge "Revert "Fix TimeZoneRegressionTest.TestJ5134 time period"" am: a2c2903f40
am: c8fab3ab50

Change-Id: I2edef334cccb6034d578b6a3c01cb4307eeed4eb