Merge "Fix the comments left on aosp/1481197"