Merge "Setup user restrictions for demo user" into nyc-mr1-dev am: a28576cb72
am: 64fc84e9c7

* commit '64fc84e9c78e143e79a0e5b2dddf97f02d1f40d9':
  Setup user restrictions for demo user

Change-Id: I414145f63da75daa63f25879dc2ef8ee167cef10