Merge "Provide a way to disassemble code in a tombstone." am: d98a584a6d am: 8697036e17
am: f72e8f64f8

Change-Id: Iaf9a5e32cb5dff7e26cfa6709766f11cad20b97c