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

Change-Id: I37f039ea44114b48b44bce7174deb3d55b2667fc