Merge "Use Empty List for Default PhysicalChannelConfig" into pi-dev