Update EducationProgram to master

Change-Id: I4f417f664988599a398381cc7f6df63c12824dfd