Merge "Make metadata field mandatory for program info struct." am: e324500f3f am: a6cbd75741 am: 7435361107
am: 098f30839e  -s ours

Change-Id: I34e879c5090ad8bf99c716f5263d9a0a57fb7fcb