Merge "Convert SnapshotStatus to proto" am: 36749bd6d0 am: 1aa20319bb
am: 75b444d0a7

Change-Id: Idc17da5962b0aa158c6c7d5c0377528afaa760ef