Merge "Snap for 5130802 from e1e9cd435ca96f82dd02ab9f735b9f31d71535c0 to pie-cts-release" into pie-cts-release