[automerger skipped] Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into pi-dev am: 6906bf5f -s ours am: 1267c17a -s ours am: 27878506 -s ours am: f4d9f16f -s ours am: 63f99776 -s ours am: a2e5b69e -s ours am: b1af411b -s ours

am skip reason: Change-Id Ifac4f0c044c2c575a29bdd5ce5d14d12373fbe70 with SHA-1 e09a7920 is in history

Change-Id: Ic7f09cc30a1ebf52b01e10fb78b4811dfeed1a2e