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

Change-Id: I157430c75cd373bda1e9c31637a0663339a2b763