Merge "Make TimeZoneTest#testSetDefaultRace time insensitive" am: 2d62fbca6b
am: 7e42f63b75

Change-Id: Ie7119e78b70721c793a5a6d03da62df73ae89ec4