Update EducationProgram to master

Change-Id: If59c701beb72249f381b5a6af3f1c76404814e45