Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481
am: e67f458667  -s ours

Change-Id: Ic5c066a81be1fe3b884cf1c9ead6c7c276a12fd1