Update EducationProgram to master

Change-Id: I110868802ab83ba2fc2030139e935d36991eb4c3
Merge "Update EducationProgram to master" into wmf/1.21wmf7