Merge "Add balsini@ as libsnapshot owner" am: 84ef7f65e8 am: 30b4536053

Change-Id: I5af100030069e1cc6e4cecb41c05eb14c47bb4e4