Merge \\\"Pre-setup restrictions\\\" into nyc-dev am: f84c05c360 am: 9220e9dec9
am: 13440a9f93

Change-Id: I278463bfe2a82a4496e3c5d35e80704a95d102f5