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

Change-Id: Ib094f9f67112998c82642dd4f8688a75f8b8e0ee