Merge "Add stress test case and some debug symbols"
am: fa8dc0707a

Change-Id: I0843a66b2708690094d639bd6e17683fe1cf1a57