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

Change-Id: I48fc80601af3296f80134ede1c0b6cfc8fcd98b5