Revert "(unstable) [modified] turned off city debug options"

This reverts commit 27951ec0bb2605fffade713598e1ec48f74ed52c.

Change-Id: I8cfe01072d5441a7b5e00ef66c138d7fc81a5054
Merge "Revert "(unstable) [modified] turned off city debug options"" into unstable