Merge "Merge "DO NOT MERGE Fix test_getZoneStrings_GMT_short_names" into...

Merge "Merge "DO NOT MERGE Fix test_getZoneStrings_GMT_short_names" into lollipop-mr1-cts-dev am: 28c4f74b  -s ours" into marshmallow-cts-dev am: 16d3bc63  -s ours am: 46ec47b8 am: 1677d847 am: 0a287e19 am: 48af8a94  -s ours am: d7aecd4a am: 8dbef348
am: 153860f6

Change-Id: Idf8991d9bd109a6826252a392a67bac04dea27cd