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

Change-Id: I64e13fb52fac71806e5fcd893edc81bdb554e1d1