Merge "libsnapshot: proto use correct index" into rvc-dev am: ee418ecb66

Change-Id: I5fab0e02a8a1dc493194ff4aa9d0516e44467cce