Merge "Changing user switching messages for demo mode" into nyc-mr1-dev
am: 5ac8499b25

* commit '5ac8499b25b1533c7e605f8b2cf3861e7cd7970c':
  Changing user switching messages for demo mode

Change-Id: I822aed2c9762f680e3697c18e759168c2a72b1f2