Implements blueprint merge-upstream-university-training Change-Id: I5d98d975f02cad027a5ed28a556a94cbd74f1361