Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into oc-dev am: 41d1927c3f am: 3e2270de45 am: 6d992d651b

Change-Id: I6c92126d14708a1b4eec43a185a1e61f1c217df4