Merge "Fix presubmit for hidden api."