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

[automerger skipped] Merge "Revoke 'always' web handler status when not autoverifying" into oc-mr1-dev am: f98fee61 -s ours am: 6b6f6a2b -s ours
am skip reason: Change-Id I58502d1b32d793aba9aa772fa2ad5ac38acca48a with SHA-1 a8fb6dc1 is in history

Change-Id: I07cddcbfad7f4841ef99796c8a7a64b9a5ac13c4