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

Change-Id: I117e1eb1fadb57ee47b66bd1f7ca3fad6175f75d