Merge "Snap for 5742267 from bd5fe427cd0dd05d376e7184fa7f3f59e8541ae9 to pie-cts-release" into pie-cts-release