Merge "Do not support channel configuration change within PCE"
am: ed56e77acb

Change-Id: I46123b5bebaf9418a6033a1a88d5d2542f6ade6d