Update toggle logic

Bug: 111548033

Test: Builds
Change-Id: I591297940b48cffe61ca0279ff835ccacd2a625f
2 files changed