Merge "EditSchema: add mandatory check for "name" and "photo"." into ics-mr1