Merge "Fix SDK build break due to link in hidden field in comment"