Merge "DO NOT MERGE: Remove test that depends on tz data" into marshmallow-cts-dev