am f5a4eabb: Merge "New user restrictions for EDU"

* commit 'f5a4eabbd7531271f523cd326e2b1d0a449b1168':
  New user restrictions for EDU