Merge "Add type to device manifest." into oc-dev