Merge "DO NOT MERGE: Remove test that depends on tz data am: 5674120f -s ours" am: ddffca24 -s ours am: 600468aa Change-Id: I0445a5aa654aa979368bc29c8dd60623b4f3650b