Simplify change username process.

Change-Id: I69f2f0ae2170129db439c7073f662ebe9ceef057