Merge "Add new default_reserved_data_coding_scheme config"
am: 7a71de717b

Change-Id: Ide11a58cae754e720862e1049ccb718670e46c31