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

[automerger skipped] Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into oc-dev am: 41d1927c am: 3e2270de am: 6d992d65 am: e384d45b am: d8f45578 am: cc7768c6 am: 7873b387 am: 7ba9dc3b am: ab2a8c16 am: a5bc465c -s ours

am skip reason: Change-Id If9046cb420961b8ef0333e9f1115eb69fb92242e with SHA-1 0a96f46e is in history

Change-Id: I1f656ba13cc8153b40f80a5ced76fb7c81214c01