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