Merge "Rename ZoneInfoDB -> ZoneInfoDb"
am: 402674f2a0

Change-Id: I3dca8a93ccbc0f5e6fd4905db82bec6d8e088164