Merge "Update settings to use latest IDs for zones" am: c75dbe9d9c
am: 0f3235a167

Change-Id: I0a7c8e33d84995b36793b2ed3485f985bc251bc5