Merge "Obtain stack trace outside of critical section" into nyc-dev am: 91deb8a
am: 18c18f6

* commit '18c18f6bbf52908ed42ec486dc4827914d24337b':
  Obtain stack trace outside of critical section

Change-Id: I6cd9bad02db66345cc13b2ce36d825f9b463ec03