Replace deprecated User::editToken call

Change-Id: I5a1d32010ce825c212eebc3284fb403b9727823e
Merge "Replace deprecated User::editToken call"