Merge "libsnapshot: no underscores in test names" am: 1451e0f14c am: 454ce6dd43 am: 14b280885d

Change-Id: I1fc4308a52e4bdaa4cc4b86d049dc547eff1eea5