Merge "Remove the public APIs for allow rich content." into rvc-dev