Merge changes from topic "snapshotctl_log" am: da8a404473

Change-Id: I4ebac8b522159ed3183ee6f5caeba38fd662f43e