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

Change-Id: I4a2abf9712db91a533e21cd859fe53c94804566f