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

Change-Id: If305094ec8a555efe6e67be8f8f2953322e19255