Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into oc-dev am: 41d1927c am: 3e2270de Change-Id: I43f76e0d351518960a01ce71419680d21714c9b6