Merge "[automerger skipped] Fix security vulnerability that creates user with no restrictions when accountOptions are too long. am: 944ea959ab am: f202c2f228 -s ours am: fcf937ad97 -s ours am: 365b1a17ec -s ours am: e5e5833afc -s ours am: 1185766a63 -s ours am: 16b4bbe53d -s ours am: 460b52dc91 -s ours" into main