Merge "Merge "Merge "Merge "DO NOT MERGE Fix...

Merge "Merge "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" into nougat-cts-dev am: 143a48bc  -s ours" into nougat-mr1-cts-dev
am: 6e7579b4  -s ours

Change-Id: I72332f7a03a9dd79222353d55dbc873e2c655300