Merge "[automerger skipped] Merge "Implement physicalChannelConfig framework/base" am: c291d323 am: 40830b3d am: ece8fcc0 -s ours"