Merge changes from topic "snapshotctl_log" am: da8a404473 am: 6d3c0ef08c am: 9345bfb0b2

Change-Id: I0cb4d5a42e43cee95614cc9397faff9b9ad34a84