lmkd: Change zoneinfo parsing to retrieve zone watermarks am: 94ce3dd573 am: ec126881d3 am: ea27b3b974
am: 8197fdeafe

Change-Id: Ia24c6c66bcdbd6c65a96c9c54f95b1054d30df5c