Merge "Add support merging system and other for the non-A/B configuration."