Merge "Snap for 6642535 from dcbe4751b4ee2d30039ad4aea74dcc581d1321fc to pie-cts-release" into pie-cts-release