Update EducationProgram to master

Change-Id: I0b748b98996b1919946ab7fcc74560679a9ef2b0