Merge "Remove ShadowLibcoreTimeZoneNames" am: 45f8352422
am: 918c0c5896

Change-Id: I43ce51a3947ddb5e3f9deadfbbce2403ece9a182