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

[automerger skipped] Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into qt-qpr1-dev am: 968e9edb -s ours am: 999f82c1

Change-Id: I2e9240413f1e7ebd1644114274714092612e4b3f