Merge \"Adding a warning dialog before restarting demo session\" into nyc-mr1-dev
am: 33657640ec

Change-Id: I7c3242f4fce4b4b29d4bfac4ea04fbd92e013bb1