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

Change-Id: Iea44bf72e2f971a213ba8a019c0c223ad57e6297