Merge "Rename ZoneInfoDB -> ZoneInfoDb"
am: 414bdcd5b5

Change-Id: I6554f763d660a292a2a2b56894ad1655b2bde0ae