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

Change-Id: Idc48e080e41d469bfb508b7fe37fd197b2119e90