Merge "Update comment for b/75318890 TODO" into pi-dev
am: 2b382c94a4

Change-Id: I3b7716e9996eb136e2d47246b5402a745ad2cb23