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

Change-Id: I4b004cee7f0cdf5ccf2f269e0b0aef8de2eb8741