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

[automerger skipped] Merge "Revoke 'always' web handler status when not autoverifying" into oc-dev am: ab012da3 am: 0cf31cf4 -s ours
am skip reason: Change-Id I58502d1b32d793aba9aa772fa2ad5ac38acca48a with SHA-1 ef5220e5 is in history

Change-Id: I80e44d4cb30a8648df50be2f5fc1b0fd084b3815