Merge \"Disabling account modification on demo users\" into nyc-mr1-dev
am: c7b1d74ae8

Change-Id: I16ce1564faa68f6c05e1dc37d0488063df3d3045