Merge "Fix two StrictMode stack collection bugs." into nyc-mr2-dev