Merge "Pipe the user restriction to the admin dialog" into pi-dev
am: c76929eb92

Change-Id: Iaba71e51075c6c1ce7c3e4bf71750c8baace89a3