Merge "Show the number of VMAs in the tombstone."
am: 92c355cc4f

Change-Id: Id6ac448ef7255eb76e792ba5985a6a305e5b2e9d