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

Change-Id: I6b620f4807f8d21c73934b5363b9d07a740eec4f