Merge "Bringing read-only contact editor in compliance with mocks"