Merge "Add snapshotctl_log to bugreport" am: 6548229367 am: 31a7b0920d am: f4b01a71c0

Change-Id: I7c9c1d597e2e871fa522b49a74a7a9d564349f37