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