Merge "Remove ShadowLibcoreTimeZoneNames"
am: 45f8352422

Change-Id: I65b07e67025ad0dfaa85fc1c873e695d69ff0a9c