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

Change-Id: I5709163e3a0f1dfb4849ae7957bba4aa3eecd046