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

* commit 'ef3a63ce74bea3f1bd4a033e34070954aa905135':
  Changing user switching messages for demo mode

Change-Id: Ic8c41f7790d40198f20ef088cf37a11a0f153a4c