Update EducationProgram to master

Change-Id: Iba546692da08916115084387b190be13bfa9f5b1