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