Merge \\"Pre-setup restrictions\\" into nyc-dev am: f84c05c360
am: 47d17a4f18

Change-Id: I91a96f403911ffc899c082df0c010ff242848ebb