Merge "Snap for 5240828 from cfb529fc644302dc244f67eb37b1f09179ade300 to pie-cts-release" into pie-cts-release