Merge "Snap for 5180536 from b81da563b0d170a4f1103dbc5b33ffa66ee7262a to pi-platform-release am: 73eea8fa7e" into pie-cuttlefish-testing