Merge "[automerger skipped] Merge "Implement physicalChannelConfig framework/base" am: c291d32338 am: 40830b3d4a am: ece8fcc0c7  -s ours"