6967937: Scope id no longer being set after 6931566

Reviewed-by: alanb, dsamersoff
2 files changed