Merge \"Use user id 0 to get missing appId for debugger\" into nyc-dev
am: 792918e5fd

Change-Id: I8ccb08fe3aa9c00b715078086b233a55a338eb94