Merge "Add new default_reserved_data_coding_scheme config" am: 7a71de717b
am: 3676ee2e12

Change-Id: Idc1f8e61fbae88c71bde58aa56cf4b0bbf76b26b