[automerger] Merge "Adjusting restrictions applied to non-admins." into pi-dev am: ed7a40040e am: 60d96eb3d6

Change-Id: Ia073d7ca4e39ed073fc86b821a8abae832e36584