[automerger skipped] Only write stacks traces to tombstoned am: 0e5dc3438d
am: 24497bd1ed -s ours
am skip reason: change_id I3c7e895dff7d9df5f8d14c1b1235c1c943d32295 with SHA1 6cca24104a is in history

Change-Id: If0722eb382417e697af3760cf192c4adb43b9891