[automerger skipped] Merge "Update comment for b/75318890 TODO" into pi-dev am: 2b382c94a4
am: b59b7f3449  -s ours

Change-Id: I8f5502628af24ab3c4a6c617f65d0693bd66069a