Update EducationProgram to master

Change-Id: I2eda9e49cf13ae295e6a46ca823840b5a743835d