[changed] Cities and frogs

Change-Id: I26263119022816a21bfc58d5c55d961e92b121bc