Merge "Snap for 5240828 from f11c60fc96b21010532bffe69d94cce5066fdd10 to pie-cts-release" into pie-cts-release