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

Change-Id: Ic67fa3b042b5a72f11ce9b37a1c12babfbbe77bb