am cb9102e0: am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.

Merge commit 'cb9102e056e8553745c2abd942852232bfadd98b'

* commit 'cb9102e056e8553745c2abd942852232bfadd98b':
  eng builds only -- make the thing that makes setupwizard optional actually work.