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

Change-Id: I75f0b983ef5057972246175d2b7019a5c2002564