am 99c0c851: Merge "Collapse extra raw contact editors" into lmp-mr1-dev

* commit '99c0c8519483dd187fa0dd21cb83065966253b7f':
  Collapse extra raw contact editors