Merge "Snap for 8480133 from 5dba74a45edf41b51c329ea61cdd504aff4f1564 to pie-cts-release" into pie-cts-release