Merge "Make metadata field mandatory for program info struct." am: e324500f3f am: a6cbd75741
am: 7435361107

Change-Id: Ic051cdebeeb3ff81432415f55928f44fb2fc7889