Update EducationProgram to master

Change-Id: I56e1b7dc70553ee7ef7e2c83d8828a9be9d890ce