Update EducationProgram to master

Change-Id: I9e3f75f5c346d2191a30d9df88d2722382713562