Merge "Remove TimeZoneTest.testAllDisplayNames() failure" am: f5ca86683e
am: a9e5b82a5f

Change-Id: I5214eb3f7b6687f98a0528b34985a3dbfc2d7afb