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

Change-Id: I7cbffcbb84841e9faf9f55d8423bb91c6165a83c