Update EducationProgram to master

Change-Id: I89e805df44113fd2a9d9fecf4ec47b04da001248