Merge "Snap for 5063321 from 4a004c90cf2c1deeb16f916cd641e66f31d19433 to pie-cts-release" into pie-cts-release