Merge "Fix element list in channel_configuration_14 description" am: 83e30f0f7b
am: e9e770ba71

Change-Id: Iff794b79659de4e4ce552b4ecb5c171b3f959faa