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

Change-Id: I1f10485c805426597c147c95197a47340b374105