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

Change-Id: Ifc6119b6da686bd045f300f964f4875aaa1579a1