Update EducationProgram to master

Change-Id: I63bf13b4438408ac51d91daf380a31e2b3898355