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

Change-Id: I2b57a55e8bb36ba24578c00e2afaebfc21e0e4c3