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

Change-Id: Ic501eb9b08f18eb3e9f3e95d64aae511815db268