Merge "Merge "Merge "DO NOT MERGE Fix test_getZoneStrings_GMT_short_names" into lollipop-mr1-cts-dev am: 28c4f74bbd  -s ours" into marshmallow-cts-dev am: 16d3bc63f1  -s ours" into nougat-cts-dev
am: 143a48bc27  -s ours

Change-Id: I53416bfbed192f880b844b832080c387e69a0439