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

Change-Id: I4fb90f37ac17f56f6d4ffe78a64f4c69e5b11049