Merge \\"An API to check if running in a demo user\\" into nyc-mr1-dev am: b71081e4e9
am: b61a5f1d64

Change-Id: I3e4e57997ecf942d0607628529f0bf97f4c1d2ce