Revert submission 21161765-sessionhint_api

Reason for revert: this broke the main-finalization-1 build... somehow. see b/268111957

Reverted changes: /q/submissionid:21161765-sessionhint_api

Change-Id: I23ca8da4957aa030d7788d22fc946259e34ee3cf