Merge "DO NOT MERGE Fix test_getZoneStrings_GMT_short_names" into lollipop-mr1-cts-dev
am: 28c4f74bbd  -s ours

Change-Id: I032dbfec4918448829b232c8815db5499782411e