Merge "Added profile-owner and device-owner on cmd user and dump user."