Update EducationProgram to master

Change-Id: If53d7a29ff98788cc6a89658c258f1a480a7bea1