Android CTS 5.1 Release 28 (4607396)
Merge "DO NOT MERGE Fix test_getZoneStrings_GMT_short_names" into lollipop-mr1-cts-dev