Merge "Correct annotations in ZoneInfoDb"