Merge "Fix the comments from aosp/1719018"