Merge "[automerger skipped] Fix security vulnerability that creates user with...

Merge "[automerger skipped] Fix security vulnerability that creates user with no restrictions when accountOptions are too long. am: 944ea959 am: f202c2f2 -s ours am: fcf937ad -s ours am: 365b1a17 -s ours am: e5e5833a -s ours am: 1185766a -s ours am: 16b4bbe5 -s ours am: 460b52dc -s ours" into main