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

Change-Id: If3708653ad78fb38e57508c4d8fac9dd5bffc2c1