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

Change-Id: I0bc7e426b0dfc4d233b9caa263e5361f94dbf6f2