Update EducationProgram to master

Change-Id: I53445463b2d2de48f27bdf9eb53413cd2b21daee