Merge "Snap for 7174163 from 63076c657d11222158de19b9e274da5da96c6bed to busytown-mac1010-release" into busytown-mac1010-release