Merge "Set timeout in TimeZoneTest#testSetDefaultRace" am: 5f3dca18fc am: 693d9fca22
am: 44de76a52b

Change-Id: Id9c1cef74d7de52ef9777316abd96a41d5928b7d