Merge "[RCS] Add initial RcsFeature type" am: 6cb5422c5b
am: ca6995b7bc

Change-Id: Ic0a07c251380fe5dcbc0053d2d67d327ad28be46