Merge "Identify post-apexd crashing processes" am: 91fa140312
am: 9469df055e

Change-Id: Ia012f09dc8aea72b3803f4e552da5dd36fd92c89