Merge "API Guidelines: add guidelines around userId arguments"