Update EducationProgram to master

Change-Id: Iefd0e54cfc3a4f371fe88334b998b7e01c00407d