Merge "DO NOT MERGE Fix tests which relied on Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev