Merge "Revoke 'always' web handler status when not autoverifying" into oc-dev am: ab012da3a2

Change-Id: I9515e311ff75532171bd893ddc6f3971a1fdea0c