Merge "API: Use message-per-value for apihelp-query+siteinfo-param-prop"