Update EducationProgram to master

Change-Id: I851be677591534be015f3ac65075c471408ae829