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

Change-Id: Iee9eabede08c37156a0b99025069f6ceb4d6b22d