Merge "Collapse extra raw contact editors" into lmp-mr1-dev