am f9171bb3: Cherry-pick: Area code gets eaten in Chips

* commit 'f9171bb324685aef7d274cd43427512a56f22522':
  Cherry-pick: Area code gets eaten in Chips