diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index bd4c3e855fe..8f89a5f9846 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -25,6 +25,7 @@ import android.content.Context;
 import android.content.pm.UserInfo;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.os.Trace;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
@@ -344,6 +345,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
 
     @VisibleForTesting
     void switchUser() {
+        Trace.beginSection("UserDetailSettings.switchUser");
         try {
             if (mUserInfo.isGuest()) {
                 mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_SWITCH_TO_GUEST);
@@ -352,6 +354,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
         } catch (RemoteException re) {
             Log.e(TAG, "Error while switching to other user.");
         } finally {
+            Trace.endSection();
             finishFragment();
         }
     }
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 23cdaf987f7..92d1baec6de 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -40,6 +40,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Process;
 import android.os.RemoteException;
+import android.os.Trace;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.ContactsContract;
@@ -798,6 +799,7 @@ public class UserSettings extends SettingsPreferenceFragment
     }
 
     private void addUserNow(final int userType) {
+        Trace.beginAsyncSection("UserSettings.addUserNow", 0);
         synchronized (mUserLock) {
             mAddingUser = true;
             mAddingUserName = userType == USER_TYPE_USER
@@ -824,6 +826,11 @@ public class UserSettings extends SettingsPreferenceFragment
 
         @Override
         public void run() {
+            runAddUser();
+            Trace.endAsyncSection("UserSettings.addUserNow", 0);
+        }
+
+        private void runAddUser() {
             UserInfo user;
             String username;
 
@@ -1198,8 +1205,10 @@ public class UserSettings extends SettingsPreferenceFragment
         } else if (pref == mAddGuest) {
             mAddGuest.setEnabled(false); // prevent multiple tap issue
             mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_USER_GUEST_ADD);
+            Trace.beginSection("UserSettings.addGuest");
             UserInfo guest = mUserManager.createGuest(
                     getContext(), getString(com.android.settingslib.R.string.user_guest));
+            Trace.endSection();
             if (guest == null) {
                 Toast.makeText(getContext(),
                         com.android.settingslib.R.string.add_user_failed,