Merge "Snap for 7309127 from a006688a9a6dc146eec21539df941dc3e10dbb9f to pie-cts-release" into pie-cts-release