Blueprint: feature-groups

Change-Id: Iee7fa91cbf03553278745892049ae317ce54d722
Merge "Blueprint: feature-groups"