Merge "Snap for 5053079 from b86e2855373731bb54948cee1dda9d73d3309eff to pi-qpr2-release" into pi-qpr2-release