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

Change-Id: I66c788f34ee66c8ca0602d56a1bf729b78b15abc