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

Change-Id: I2902c765eeacdbe05a393b01936572233c783988