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

[automerger skipped] Merge "Revoke 'always' web handler status when not autoverifying" into pi-dev am: 187f52a4 -s ours am: 44278289 -s ours
am skip reason: Change-Id I58502d1b32d793aba9aa772fa2ad5ac38acca48a with SHA-1 a8fb6dc1 is in history

Change-Id: I205597d434fa161742798c3ec22d39b1b4454908