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

Change-Id: Ifd264d67ce6901054b31f65981f4c736589f91f8