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

Change-Id: Ie4e01ae963a86346acbc81d2ca5824ddefef8d20