tree b2694a6ea5c794edee4dbcc1eecba780af39c6e4
parent 1c2d522d1b2112b5a2b8925868938c359fa09664
author Winson Chung <winsonc@google.com> 1623790580 -0700
committer Winson Chung <winsonc@google.com> 1623790626 -0700

Do some additional cleanup when switching handlers

Bug: 183962705
Test: Presubmit

Change-Id: Ia9295d2cf89fa6b6fe77c5e4861a704c4a82ab12