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

Change-Id: I76343c08ccdc9e4cffd5d4507956cf048fce40da