[automerger skipped] Merge "Revert "Revoke 'always' web handler status when...

[automerger skipped] Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into oc-mr1-dev am: d28fc17d -s ours am: 34aafa29 -s ours am: fb992147 -s ours am: 6c6edf77 -s ours am: 47a8f775 -s ours

am skip reason: Change-Id Ife6cd66e0bae5738c08962a8fa9397973e33f28e with SHA-1 63b6cfd9 is in history

Change-Id: I884bb94a875cf59703598f20580f6343f5631e46