Merge "Support for devices with a chin." into cw-d-mr1-dev