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