Update EducationProgram to master

Change-Id: Ib1498178e1f5c0412496c091b971f2cebff72e76