Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Test all-numeric username Change-Id: Ie659c4e19b9258dcb5b4ada96305d47b591cd5b7