Merge "Remove the public APIs for allow rich content." into rvc-dev am: 2ebe60b5 am: 32f03587 am: d7368f27 Change-Id: I01602847f8349b83c46f34e83edb6b2205e8abd9