Merge "Snap for 5009372 from d2ea50a07756ecb73dc1a5ec773455bc42d062fb to pie-cts-release" into pie-cts-release