[automerger skipped] Merge "Revoke 'always' web handler status when not autoverifying" into pi-dev am: 187f52a4d7 -s ours am: 4427828992 -s ours am: 8e5969a697 -s ours am: 8784c1a3eb -s ours
am skip reason: Change-Id I58502d1b32d793aba9aa772fa2ad5ac38acca48a with SHA-1 a8fb6dc167 is in history

Change-Id: I7b9b13697dd3d6c067c1fbc79ed5dd94e475ac5e