Merge "Fix incorrect RS stub declarations."