Merge "Add PhysicalChannelConfig." am: c584d2772d am: 3deaafd8cd
am: 9d3738232c

Change-Id: I707415785137603f787ff5e12035d58980a21d18