Add country mapping metadata support am: fc88022377 am: 57d1c27b2c
am: 55be112173

Change-Id: I3d3cb317d77ea48fad26c89d4358e814f71df522