Merge "Plumb PhysicalChannelConfig all the way up." am: 44d13875ff am: c870528371
am: 7771e91a99

Change-Id: Ia0a69386981e2984472e9153c161cca7bfccc9dd