Merge "Fix two typos on comment." into sc-v2-dev