Merge "Add system feature for Companion Device Manager"