Merge "Fix the comments from aosp/1717479." into sc-dev