Pre-setup restrictions DO NOT MERGE
am: e6ad6e866b

Change-Id: I0bfc276c9bf0e3d6320cc9aa8c77f77899b69e04