Merge "DO NOT MERGE: Remove test that depends on tz data am: 5674120f14  -s ours"