Update EducationProgram to master

Change-Id: Ie1c47b26e9a96cbda6603f1ee2a93cbf2c1cfab4