Update EducationProgram to master

Change-Id: Ife676c9d8546cde6a4ffaab6478c05edea3030ad