Update EducationProgram to master

Change-Id: I90179260ebf16dc7ed9132ce90df0eef17ed0ebd