Merge "Merge "Fix the comments left on aosp/1481197" am: 464bc344a5 am: 3a37cb6552" into rvc-d1-dev-plus-aosp