Merge "Use Empty List for Default PhysicalChannelConfig" into pi-dev
am: 6e2ed97e80

Change-Id: I1cb14020b2bd87db143aab9b3401379b560df18b