Merge "Add new protection level for setup wizard" into nyc-dev
am: 3ccb354

* commit '3ccb35421d642e96048d5cdeb60043634933267d':
  Add new protection level for setup wizard

Change-Id: Ib88a868f214d1502538f544b1b5d8c5a8551b78d