Merge "Adjusting restrictions applied to non-admins." into pi-dev am: ed7a40040e
am: 95d5335390

Change-Id: I8875085298ad7cb9de6e4590e354df90359b0ea6