Merge "Update settings to use latest IDs for zones" am: c75dbe9d9c am: 0f3235a167
am: 2a3c633d49  -s ours

Change-Id: Ibc4d5dea60639ba1504290948de4675aaf6dbb17