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

Change-Id: I726325d06787a8a916874fb17b6627035a9b799d