Merge "snapshot: helper to get access snapshot_state path" am: 34ad19f4c4 am: 054e278ab1 am: f9b8446205

Change-Id: I0609f33a5d13fea8fff8689db2c32c5386c90bda