[Fixed] non-default saber hilts losing experimentation (Updated)

Change-Id: I44bf37a30076876b58c1e679246456a2e11bf9e8
[added]OID and civic structure count now show up in city report

Change-Id: I9351c266cce2a505461b798d90c35cd308ba786d
Merge "[added]OID and civic structure count now show up in city report" into unstable
Merge "[Fixed] non-default saber hilts losing experimentation (Updated)" into unstable