[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: 56a9b75b -s ours am: 0e737de4 -s ours

am skip reason: Change-Id I2b108064794b961904811c5d9f54c37dd2c7f482 with SHA-1 8cd87978 is in history

Change-Id: I5a33020458374148062469b54ad057528098fa9e