Update EducationProgram to master

Change-Id: I09c88daa79b9f87279b1cea85af19fb8a5543db2