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

Change-Id: I4cb49e0aff15f499c70ab30832504bdbea5fd923