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

* commit 'a28576cb7201b468908346b4807892706870df92':
  Setup user restrictions for demo user

Change-Id: I4121f9745f8d582c0c85240a35b6ed442e8f2850