Merge "CDD: Strengthen analog audio port requirements." into pi-dev