am 9d43dc5e: Merge "Finish rename of related users to profiles."
am 9d43dc5e: Merge "Finish rename of related users to profiles."

* commit '9d43dc5e4eba1bf96f0b8fa5deae5ee61a7f85ad':
  Finish rename of related users to profiles.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base