Merge "Update comment for b/75318890 TODO" into pi-dev