Merge "Remove Deprecated-At-Birth APIs from PDCS"