Pre-setup restrictions DO NOT MERGE am: e6ad6e866b
am: 2d21d1b9cf
am: 68d53c0481
am: e67f458667
-s ours
am: 2703570242
Change-Id: I0e3964b7a1b7398ae96a798de892a40d05be0add
This commit is contained in: