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

Change-Id: Ie9de704ba4aee6954e9ca82df8c56bc81a482c32