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

Change-Id: Ie0a74c69155d7a6cb06fbd4e20caef2d69def631