Merge "Fill update, rebuild, list API response schema for 2.47"