Merge "Improvements on UserManagerService ShellCommand implementation (1/4)." into tm-dev