Merge "installd: parameterize user data snapshots with snapshot_id"
am: 8a3c8b1a94

Change-Id: Id1393797cda2a83ae39c4dd016657b9ad57b451a