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

Change-Id: I4e663238ab4edb5b8fbf15a56bb810df09604c68