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

Change-Id: I116aae1bf052d14e69204ee60c7d65837d5c7590