Merge "Revert "Revoke 'always' web handler status when not autoverifying""...
Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into rvc-dev am: 7f7dff72 am: c5769399 am: bb7117b1
Change-Id: Iabddb72e90c12e2cfdecec70574789612167f697